From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 11 Jul 2011 14:14:36 +0000 (+0200)
Subject: Don't save unacked messages
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~7977
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=cb1966612e0aeae8eb316c05bda6dfcc223fbc53;p=gnome-shell.git

Don't save unacked messages

Don't bother tracking which messages we need to ACK, just tell Telepathy to
ACK them all.

https://bugzilla.gnome.org/show_bug.cgi?id=654398
---

diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js
index 10ea5ac0b..9c38ccec5 100644
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@@ -576,13 +576,10 @@ ChatSource.prototype = {
     },
 
     _ackMessages: function() {
-        if (this._pendingMessages.length == 0)
-            return;
-
         // Don't clear our messages here, tp-glib will send a
         // 'pending-message-removed' for each one.
-        this._channel.ack_messages_async(this._pendingMessages, Lang.bind(this, function(src, result) {
-            this._channel.ack_messages_finish(result);}));
+        this._channel.ack_all_pending_messages_async(Lang.bind(this, function(src, result) {
+            this._channel.ack_all_pending_messages_finish(result);}));
     },
 
     _summaryItemClicked: function(source, button) {